yeref 0.29.10__tar.gz → 0.29.12__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: yeref
3
- Version: 0.29.10
3
+ Version: 0.29.12
4
4
  Summary: desc-f
5
5
  Author: john smith
6
6
  Dynamic: author
@@ -2,7 +2,7 @@ from setuptools import setup
2
2
 
3
3
  setup(
4
4
  name='yeref',
5
- version='0.29.10',
5
+ version='0.29.12',
6
6
  description='desc-f',
7
7
  author='john smith',
8
8
  packages=['yeref'],
@@ -2147,7 +2147,7 @@ allowed_startapp_params = ['fnd', 'sbt', 'don', 'sub', 'pay', 'pst', 'msg', 'ft'
2147
2147
  tids_not_for_trans = [5134596871, 5152320320, 5200969162, 5240041587, 5277505344, 5298580533, 5300792695, 5304873693,
2148
2148
  5318482236, 5372068352, 5380838469, 5456863561, 5588781655, 5621199443, 5805890320, 5846446387,
2149
2149
  5850795580, 5868482417, 5951232918, 5962132892, 5969907012]
2150
- GROUP_ANON_TID = 1087968824
2150
+ GROUP_ANON_TID = 1087968824 # GroupAnonymousBot
2151
2151
  CHANNEL_BOT_ = 136817688
2152
2152
  ferey_channel_europe = -1001471122743
2153
2153
  ferey_channel_en = -1001833151619
@@ -2189,7 +2189,7 @@ website = 'https://google.com'
2189
2189
  facebook = 'https://www.facebook.com'
2190
2190
  telegram_account = 'https://t.me'
2191
2191
  ferey_telegram_username = 'ferey_support'
2192
- ferey_telegram_demo_bot = 'FereyDemoBot'
2192
+ ferey_telegram_demo_bot = 'FereyGroupBot'
2193
2193
  ferey_address = "Estônia, Tāllin, Mäepealse, 2/1"
2194
2194
  ferey_title = "Ferey Inc."
2195
2195
  text_developer_info = (
@@ -2576,7 +2576,7 @@ async def db_select_pg(sql, param=None, db_pool=None, db_config=None):
2576
2576
  if "WHERE TRG_CONTENT LIKE '%\"isTriggered\": true%'" in sql: pass
2577
2577
  elif "SELECT NOTICE_ID, NOTICE_TYPE, NOTICE_TXT" in sql: pass
2578
2578
  elif "<= NOW()" in sql: pass
2579
- elif "CHANNEL_LZ FROM" in sql: pass
2579
+ elif "_LZ FROM" in sql: pass
2580
2580
  else:
2581
2581
  logger.info(log_ % f"SQL: {sql}, PARAM: {param}")
2582
2582
  else:
@@ -14261,45 +14261,6 @@ async def get_chat_channel(bot, link, SESSION_D, BASE_S):
14261
14261
  return result
14262
14262
 
14263
14263
 
14264
- async def auto_destroy_msg(bot, telegram_bot, chat_id, text, message_id, type_='text', sec=5):
14265
- result = None
14266
- try:
14267
- if not random.choice([0, 1, 1]): return result
14268
-
14269
- step = 1
14270
- by = f"<a href='https://t.me/{ferey_telegram_demo_bot}'>by</a>"
14271
- text = f"{text}\n\n{by} @{telegram_bot} <b>{sec}</b>sec"
14272
- ix_sec = text.rfind('</b>sec')
14273
- while text[ix_sec] != '>': ix_sec -= 1
14274
-
14275
- while sec > 0:
14276
- try:
14277
- text = text.replace(f"<b>{sec}</b>sec", f"<b>{sec - 1}</b>sec")
14278
- sec -= step
14279
- if type_ == 'text':
14280
- await bot.edit_message_text(chat_id=chat_id, text=text, message_id=message_id,
14281
- disable_web_page_preview=True)
14282
- else:
14283
- await bot.edit_message_caption(chat_id=chat_id, message_id=message_id, caption=text)
14284
- await asyncio.sleep(1)
14285
- except TelegramRetryAfter as e:
14286
- logger.info(log_ % f"TelegramRetryAfter {e.retry_after}")
14287
- await asyncio.sleep(e.retry_after + 1)
14288
- except Exception as e:
14289
- logger.info(log_ % str(e))
14290
- await asyncio.sleep(round(random.uniform(1, 2), 2))
14291
- break
14292
- except TelegramRetryAfter as e:
14293
- logger.info(log_ % f"TelegramRetryAfter {e.retry_after}")
14294
- await asyncio.sleep(e.retry_after + 1)
14295
- except Exception as e:
14296
- logger.info(e)
14297
- await asyncio.sleep(round(random.uniform(1, 2), 2))
14298
- finally:
14299
- await bot.delete_message(chat_id, message_id)
14300
- return result
14301
-
14302
-
14303
14264
  async def log_old(txt, LOG_DEFAULT, colour=92):
14304
14265
  try:
14305
14266
  logging.info(f'\033[{colour}m%s\033[0m' % (str(txt)))
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: yeref
3
- Version: 0.29.10
3
+ Version: 0.29.12
4
4
  Summary: desc-f
5
5
  Author: john smith
6
6
  Dynamic: author
File without changes
File without changes
File without changes
File without changes
File without changes