fix(shard): 🐛 Allow reporting messages sent *to* Payphone (instead of *by*).
This commit is contained in:
+8
-6
@@ -1,17 +1,19 @@
|
|||||||
FROM python:3.12 AS base
|
FROM registry.nyeki.dev/docker/python/with-uv:3.12-alpine AS base
|
||||||
|
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY . .
|
COPY pyproject.toml uv.lock /app/
|
||||||
|
|
||||||
RUN pip install uv
|
RUN python3 -m uv sync --no-dev
|
||||||
RUN uv sync --no-dev
|
|
||||||
|
COPY . /app/
|
||||||
|
|
||||||
|
|
||||||
FROM base AS shard
|
FROM base AS shard
|
||||||
|
|
||||||
ENTRYPOINT [ "uv", "run", "--no-dev", "bot.py" ]
|
CMD [ "bot.py" ]
|
||||||
|
|
||||||
|
|
||||||
FROM base AS tasks
|
FROM base AS tasks
|
||||||
|
|
||||||
ENTRYPOINT [ "uv", "run", "--no-dev", "tasks.py" ]
|
CMD [ "tasks.py" ]
|
||||||
|
|||||||
@@ -475,10 +475,7 @@ class Calls(base.Cog):
|
|||||||
"❌ You're banned from using Payphone.", ephemeral=True
|
"❌ You're banned from using Payphone.", ephemeral=True
|
||||||
)
|
)
|
||||||
|
|
||||||
message_id = await self.bot.call_handler.get_original_message_id(message.id)
|
if not await self.bot.call_handler.get_message(message.id):
|
||||||
author_id = await self.bot.call_handler.get_message_author_id(message_id)
|
|
||||||
|
|
||||||
if author_id is None:
|
|
||||||
return await ctx.send_response(
|
return await ctx.send_response(
|
||||||
(
|
(
|
||||||
"❌ More than 15 minutes have passed since this message was sent.\n"
|
"❌ More than 15 minutes have passed since this message was sent.\n"
|
||||||
@@ -487,6 +484,14 @@ class Calls(base.Cog):
|
|||||||
ephemeral=True,
|
ephemeral=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if message.author.bot:
|
||||||
|
message_id = await self.bot.call_handler.get_original_message_id(message.id)
|
||||||
|
author_id = await self.bot.call_handler.get_message_author_id(message_id)
|
||||||
|
|
||||||
|
else:
|
||||||
|
message_id = message.id
|
||||||
|
author_id = message.author.id
|
||||||
|
|
||||||
await ctx.send_response("✅ The message has been reported.", ephemeral=True)
|
await ctx.send_response("✅ The message has been reported.", ephemeral=True)
|
||||||
|
|
||||||
await models.Report.update_or_create(
|
await models.Report.update_or_create(
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "payphone"
|
name = "payphone"
|
||||||
version = "0.37.0"
|
version = "0.39.0"
|
||||||
description = "Add your description here"
|
description = "Add your description here"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
requires-python = ">=3.12"
|
requires-python = ">=3.12"
|
||||||
|
|||||||
Reference in New Issue
Block a user