Skip to content

Commit e9d66ed

Browse files
authored
Merge pull request #4274 from dev-hato/4267_add_misskey_fedi_flag
#4267 連合先からのメンションに対応
2 parents cff6ee4 + a236fbc commit e9d66ed

4 files changed

Lines changed: 12 additions & 1 deletion

File tree

.env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ DATABASE_URL=postgres://postgres:password@postgres:5432/?sslmode=require
22
DISCORD_API_TOKEN=
33
MISSKEY_API_TOKEN=
44
MISSKEY_DOMAIN=
5+
MISSKEY_FEDERATION=false
56
MODE=
67
OPENAI_API_KEY=
78
SLACK_API_TOKEN=

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@
99
- `Removed` 削除された機能について。
1010
- `Fixed` バグ修正について。
1111

12+
## Unrelease
13+
14+
### Added
15+
16+
- Misskeyモード時に、連合先からのメンションに応答するかを選べるようになりました。(#4267)
17+
1218
## v3.0.4
1319

1420
### Note

run.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,11 @@ async def misskey_runner():
222222
note = data["body"]["body"]
223223
host = note["user"].get("host")
224224
mentions = note.get("mentions")
225+
# FEDERATIONがtrueならばリモートからのメンションにも応答する。
226+
# falseならばローカルのメンションのみに応答する。
225227
if (
226-
host is None or host == conf.MISSKEY_DOMAIN
228+
(conf.MISSKEY_FEDERATION == "true")
229+
or (host is None or host == conf.MISSKEY_DOMAIN)
227230
) and mentions:
228231
cred = None
229232

slackbot_settings.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
# Misskey用の設定
4444
MISSKEY_DOMAIN = str(os.environ["MISSKEY_DOMAIN"])
4545
MISSKEY_API_TOKEN = str(os.environ["MISSKEY_API_TOKEN"])
46+
MISSKEY_FEDERATION = str(os.environ.get("MISSKEY_FEDERATION", "false"))
4647

4748
MODE = str(os.environ["MODE"])
4849

0 commit comments

Comments
 (0)