warp-beacon 2.3.21__py3-none-any.whl → 2.3.22__py3-none-any.whl

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.
Files changed (10) hide show
  1. warp_beacon/__version__.py +1 -1
  2. warp_beacon/storage/__init__.py +1 -4
  3. warp_beacon/telegram/bot.py +1 -1
  4. warp_beacon/telegram/handlers.py +7 -1
  5. {warp_beacon-2.3.21.dist-info → warp_beacon-2.3.22.dist-info}/METADATA +1 -1
  6. {warp_beacon-2.3.21.dist-info → warp_beacon-2.3.22.dist-info}/RECORD +10 -10
  7. {warp_beacon-2.3.21.dist-info → warp_beacon-2.3.22.dist-info}/LICENSE +0 -0
  8. {warp_beacon-2.3.21.dist-info → warp_beacon-2.3.22.dist-info}/WHEEL +0 -0
  9. {warp_beacon-2.3.21.dist-info → warp_beacon-2.3.22.dist-info}/entry_points.txt +0 -0
  10. {warp_beacon-2.3.21.dist-info → warp_beacon-2.3.22.dist-info}/top_level.txt +0 -0
warp_beacon/__version__.py CHANGED
@@ -1,2 +1,2 @@
1
- __version__ = "2.3.21"
1
+ __version__ = "2.3.22"
2
2
 
warp_beacon/storage/__init__.py CHANGED
@@ -116,7 +116,4 @@ class Storage(object):
116
116
  except Exception as e:
117
117
  logging.error("Error occurred while trying to read from the database!")
118
118
  logging.exception(e)
119
- return ret
120
-
121
-
122
-
119
+ return ret
warp_beacon/telegram/bot.py CHANGED
@@ -347,7 +347,7 @@ class Bot(object):
347
347
  render_donates = os.environ.get("ENABLE_DONATES", None) == "true"
348
348
  keyboard_buttons = [[]]
349
349
  if job.short_text:
350
- keyboard_buttons[0].append(InlineKeyboardButton("📖 Read more", callback_data=f"read_more:{job.job_origin}:{job.uniq_id}"))
350
+ keyboard_buttons[0].append(InlineKeyboardButton("📖 Read more", callback_data=f"read_more:{job.job_origin.value}:{job.uniq_id}"))
351
351
  if render_donates:
352
352
  keyboard_buttons[0].append(InlineKeyboardButton("❤ Donate", url=os.environ.get("DONATE_LINK", "https://pay.cryptocloud.plus/pos/W5BMtNQt5bJFoW2E")))
353
353
 
warp_beacon/telegram/handlers.py CHANGED
@@ -41,6 +41,8 @@ class Handlers(object):
41
41
  media_type=JobType[d["media_type"].upper()],
42
42
  message_id=message.id,
43
43
  chat_type=message.chat.type,
44
+ uniq_id=d["uniq_id"],
45
+ job_origin=Origin(d["origin"]),
44
46
  source_username=Utils.extract_message_author(message)
45
47
  )
46
48
  )
@@ -171,6 +173,8 @@ class Handlers(object):
171
173
  await self.bot.upload_job(
172
174
  UploadJob(
173
175
  url=url,
176
+ uniq_id=uniq_id,
177
+ job_origin=origin,
174
178
  tg_file_id=",".join(tg_file_ids),
175
179
  message_id=effective_message_id,
176
180
  media_type=JobType.COLLECTION,
@@ -186,6 +190,8 @@ class Handlers(object):
186
190
  await self.bot.upload_job(
187
191
  UploadJob(
188
192
  url=url,
193
+ uniq_id=uniq_id,
194
+ job_origin=origin,
189
195
  tg_file_id=tg_file_ids.pop(),
190
196
  message_id=effective_message_id,
191
197
  media_type=media_type,
@@ -230,7 +236,7 @@ class Handlers(object):
230
236
  parts = query.data.split(':')
231
237
  if len(parts) == 3:
232
238
  _, origin, uniq_id = parts
233
- logging.info("Handling read_more request: uniq_id='%s', origin='%s", uniq_id, origin)
239
+ logging.info("Handling read_more request: uniq_id='%s', origin='%s'", uniq_id, origin)
234
240
  db_results = []
235
241
  if uniq_id and origin:
236
242
  db_results = self.storage.db_find(uniq_id=uniq_id.strip(), origin=origin.strip())
{warp_beacon-2.3.21.dist-info → warp_beacon-2.3.22.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: warp_beacon
3
- Version: 2.3.21
3
+ Version: 2.3.22
4
4
  Summary: Telegram bot for expanding external media links
5
5
  Home-page: https://github.com/sb0y/warp_beacon
6
6
  Author: Andrey Bagrintsev
{warp_beacon-2.3.21.dist-info → warp_beacon-2.3.22.dist-info}/RECORD RENAMED
@@ -4,7 +4,7 @@ var/warp_beacon/accounts.json,sha256=OsXdncs6h88xrF_AP6_WDCK1waGBn9SR-uYdIeK37GM
4
4
  var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
5
5
  var/warp_beacon/proxies.json,sha256=VnjlQDXumOEq72ZFjbh6IqHS1TEHqn8HPYAZqWCeSIA,95
6
6
  warp_beacon/__init__.py,sha256=_rThNODmz0nDp_n4mWo_HKaNFE5jk1_7cRhHyYaencI,163
7
- warp_beacon/__version__.py,sha256=6UhT1nd_TkHwjXTkZNK_C-VHrZtCaOZ_dAuJOK8O9iU,24
7
+ warp_beacon/__version__.py,sha256=K-gR7pjA4PhxFmv2BmDHgWMBSnNUUYNiCESv-qN1hZE,24
8
8
  warp_beacon/warp_beacon.py,sha256=7KEtZDj-pdhtl6m-zFLsSojs1ZR4o7L0xbqtdmYPvfE,342
9
9
  warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
10
10
  warp_beacon/compress/video.py,sha256=_PDMVYCyzLYxHv1uZmmzGcG_8rjaZr7BTXsXTTy_oS4,2846
@@ -33,18 +33,18 @@ warp_beacon/scraper/youtube/abstract.py,sha256=cBtExei2Cb3o4YBtHqi8If_FdmE6NyJqN
33
33
  warp_beacon/scraper/youtube/music.py,sha256=qbijpSv54fsrIYHeY-nfmw4vo6oBmedQHsVG8pXNfrc,1380
34
34
  warp_beacon/scraper/youtube/shorts.py,sha256=ujGEV7ILXHqBRa99SyITsnR7ulAHJDtumAh51kVX880,1231
35
35
  warp_beacon/scraper/youtube/youtube.py,sha256=fGrbjBngvvNdpzhb1yZVedNW0_tCrLc31VSYMSHzcQY,2135
36
- warp_beacon/storage/__init__.py,sha256=xEzexwWZTMtjVesQ73BLhS0VkWoqRXSUmuXS4h5HOvY,3402
36
+ warp_beacon/storage/__init__.py,sha256=0Vajd0oITKJfu2vmNx5uQSt3-L6vwIvUYWJo8HZCjco,3398
37
37
  warp_beacon/storage/mongo.py,sha256=qC4ZiO8XXvPnP0rJwz4CJx42pqFsyAjCiW10W5QdT6E,527
38
38
  warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
39
- warp_beacon/telegram/bot.py,sha256=-XUD8oKgDs3EZHVMZYbg4cZMslkG5e9FwcK7aWoVyEs,16469
39
+ warp_beacon/telegram/bot.py,sha256=Ldl3MxARyO1EBqJRZdpazgM1JrHsND2VXTJ1CK18bkk,16475
40
40
  warp_beacon/telegram/caption_shortener.py,sha256=6J4Dp35mOmJEyctiuN8WXM39bkQ13m78HoghsYX3fbU,1548
41
- warp_beacon/telegram/handlers.py,sha256=PhhsLmGES-NACwRojQI0yrTsfZaHP-ZnSuRUYHEViBc,8599
41
+ warp_beacon/telegram/handlers.py,sha256=JVlPbqGG3hXIvROceo_tZAu99yoiLyLbMY3TcTj5SOM,8766
42
42
  warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
43
43
  warp_beacon/telegram/utils.py,sha256=9uebX53G16mV7ER7WgfdWBLFHHw14S8HBt9URrIskg0,4440
44
44
  warp_beacon/uploader/__init__.py,sha256=5KRWsxPRGuQ56YhCEnJsXnb-yQp8dpvWEsPDf0dD-fw,4964
45
- warp_beacon-2.3.21.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
46
- warp_beacon-2.3.21.dist-info/METADATA,sha256=_bV50KTjywdi2oLJGTRf3z4EtIb0duoNX4_BOPIjXrc,21723
47
- warp_beacon-2.3.21.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
48
- warp_beacon-2.3.21.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
49
- warp_beacon-2.3.21.dist-info/top_level.txt,sha256=2iKFlYwJ-meO9sCX4OGEP1hhQN17t2KFksQ5dXMhXUA,1103
50
- warp_beacon-2.3.21.dist-info/RECORD,,
45
+ warp_beacon-2.3.22.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
46
+ warp_beacon-2.3.22.dist-info/METADATA,sha256=h2kESijehZjya2RCIP49t0puX9EJ088t83ahS4SzQP4,21723
47
+ warp_beacon-2.3.22.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
48
+ warp_beacon-2.3.22.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
49
+ warp_beacon-2.3.22.dist-info/top_level.txt,sha256=2iKFlYwJ-meO9sCX4OGEP1hhQN17t2KFksQ5dXMhXUA,1103
50
+ warp_beacon-2.3.22.dist-info/RECORD,,