Diffusion mattata 922d3bd3d5dc

Merge branch 'develop' into feat/router-expansion
922d3bd3d5dc
Actions

Project Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'develop' into feat/router-expansion

Conflicts:
src/core/router.lua

Details

Provenance

Matt Hesketh

Authored on Feb 14 2026, 11:40 AM

Parents

R69:cbd2c845f79b: Merge pull request #93 from wrxck/fix/content-updates
R69:45552f3c9561: feat(router): add handlers for 9 new Telegram update types

Branches

Unknown

Tags

Unknown

References

feat/router-expansion

Event Timeline

Matt Hesketh <matt@heskethwebdesign.co.uk> committed R69:922d3bd3d5dc: Merge branch 'develop' into feat/router-expansion (authored by Matt Hesketh <matt@heskethwebdesign.co.uk>).Feb 14 2026, 11:40 AM

Merged Changes

cbd2c845f79b Merge pull request #93 from wrxck/fix/content-updates
Author
Matt Hesketh
Browse Repository
No Builds
No Audits
616ac6b29245 Merge pull request #98 from wrxck/feat/async-security-botapi
Author
Matt Hesketh
Browse Repository
No Builds
No Audits
fbc5f4805b09 feat(v2.2): async http, stored procedures, 13 new plugins, api modernization
Author
Matt Hesketh
Browse Repository
No Builds
No Audits
0aede7bac2d9 fix(content): make links configurable, register commands, enhance /id
Author
Matt Hesketh
Browse Repository
No Builds
No Audits

Changes (140)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

docker-compose.matticate.yml

docker-compose.yml

main.lua

mattata-2.0-0.rockspec

	mattata-2.2-0.rockspec
	mattata-2.0-0.rockspec

spec/

helpers/

mock_api.lua

mock_redis.lua

middleware/

captcha_spec.lua

plugins/

admin/

ban_spec.lua

utility/

help_spec.lua

ping_spec.lua

src/

core/

db/

migrations/

006_import_procedures.lua

middleware/

captcha.lua

stats.lua

plugins/

admin/

federation/

ai/

fun/

media/

utility/

R69:922d3bd3d5dc

View Options

.env.example

Load File

View Options

.gitignore

Load File

View Options

CONTRIBUTING.md

Load File

View Options

README.md

Load File

View Options

docker-compose.matticate.yml

Load File

View Options

docker-compose.yml

Load File

View Options

main.lua

Load File

View Options

mattata-2.0-0.rockspec

Load File

View Options

mattata-2.2-0.rockspec

Load File

View Options

spec/helpers/mock_api.lua

Load File

View Options

spec/helpers/mock_redis.lua

Load File

View Options

spec/middleware/captcha_spec.lua

Load File

View Options

spec/plugins/admin/ban_spec.lua

Load File

View Options

spec/plugins/utility/help_spec.lua

Load File

View Options

spec/plugins/utility/ping_spec.lua

Load File

View Options

src/core/database.lua

Load File

View Options

src/core/http.lua

Load File

View Options

src/core/loader.lua

Load File

View Options

src/core/permissions.lua

Load File

View Options

src/core/redis.lua

Load File

View Options

src/core/router.lua

Load File

View Options

src/core/session.lua

Load File

View Options

src/db/init.lua

Load File

View Options

src/db/migrations/006_import_procedures.lua

Load File

View Options

src/middleware/captcha.lua

Load File

View Options

src/middleware/stats.lua

Load File

View Options

src/plugins/admin/addalias.lua

Load File

View Options

src/plugins/admin/addtrigger.lua

Load File

View Options

src/plugins/admin/administration.lua

Load File

View Options

src/plugins/admin/allowedlinks.lua

Load File

View Options

src/plugins/admin/allowlink.lua

Load File

View Options

src/plugins/admin/allowlist.lua

Load File

View Options

src/plugins/admin/antilink.lua

Load File

View Options

src/plugins/admin/antispam.lua

Load File

View Options

src/plugins/admin/autodelete.lua

Load File

View Options

src/plugins/admin/ban.lua

Load File

View Options

src/plugins/admin/blocklist.lua

Load File

View Options

src/plugins/admin/channel.lua

Load File

View Options

src/plugins/admin/customcaptcha.lua

Load File

View Options

src/plugins/admin/demote.lua

Load File

View Options

src/plugins/admin/federation/delfed.lua

Load File

View Options

src/plugins/admin/federation/fadmins.lua

Load File

View Options

src/plugins/admin/federation/fallowlist.lua

Load File

View Options

src/plugins/admin/federation/fban.lua

Load File

View Options

src/plugins/admin/federation/fbaninfo.lua

Load File

View Options

src/plugins/admin/federation/fdemote.lua

Load File

View Options

src/plugins/admin/federation/feds.lua

Load File

View Options

src/plugins/admin/federation/fpromote.lua

Load File

View Options

src/plugins/admin/federation/joinfed.lua

Load File

View Options

src/plugins/admin/federation/leavefed.lua

Load File

View Options

src/plugins/admin/federation/myfeds.lua

Load File

View Options

src/plugins/admin/federation/newfed.lua

Load File

View Options

src/plugins/admin/federation/unfban.lua

Load File

View Options

src/plugins/admin/filter.lua

Load File

View Options

src/plugins/admin/groups.lua

Load File

View Options

src/plugins/admin/import.lua

Load File

View Options

src/plugins/admin/init.lua

Load File

View Options

src/plugins/admin/join_captcha.lua

Load File

View Options

src/plugins/admin/kick.lua

Load File

View Options

src/plugins/admin/link.lua

Load File

View Options

src/plugins/admin/logchat.lua

Load File

View Options

src/plugins/admin/mute.lua

Load File

View Options

src/plugins/admin/nodelete.lua

Load File

View Options

src/plugins/admin/pin.lua

Load File

View Options

src/plugins/admin/promote.lua

Load File

View Options

src/plugins/admin/purge.lua

Load File

View Options

src/plugins/admin/report.lua

Load File

View Options

src/plugins/admin/rules.lua

Load File

View Options

src/plugins/admin/save.lua

Load File

View Options

src/plugins/admin/setcaptcha.lua

Load File

View Options

src/plugins/admin/setgrouplang.lua

Load File

View Options

src/plugins/admin/setwelcome.lua

Load File

View Options

src/plugins/admin/slowmode.lua

Load File

View Options

src/plugins/admin/staff.lua

Load File

View Options

src/plugins/admin/tempban.lua

Load File

View Options

src/plugins/admin/tempmute.lua

Load File

View Options

src/plugins/admin/topic.lua

Load File

View Options

src/plugins/admin/triggers.lua

Load File

View Options

src/plugins/admin/trust.lua

Load File

View Options

src/plugins/admin/unban.lua

Load File

View Options

src/plugins/admin/unfilter.lua

Load File

View Options

src/plugins/admin/unmute.lua

Load File

View Options

src/plugins/admin/untrust.lua

Load File

View Options

src/plugins/admin/warn.lua

Load File

View Options

src/plugins/admin/wordfilter.lua

Load File

View Options

src/plugins/ai/ai.lua

Load File

View Options

src/plugins/fun/catfact.lua

Load File

View Options

src/plugins/fun/dice.lua

Load File

View Options

src/plugins/fun/doge.lua

Load File

View Options

src/plugins/fun/game.lua

Load File

View Options

src/plugins/fun/init.lua

Load File

View Options

src/plugins/fun/inspirobot.lua

Load File

View Options

src/plugins/fun/poll.lua

Load File

View Options

src/plugins/fun/quote.lua

Load File

View Options

src/plugins/fun/reactions.lua

Load File

View Options

src/plugins/fun/slap.lua

Load File

View Options

src/plugins/media/cats.lua

Load File

View Options

src/plugins/media/gif.lua

Load File

View Options

src/plugins/media/init.lua

Load File

View Options

src/plugins/media/itunes.lua

Load File

View Options

src/plugins/media/qr.lua

Load File

View Options

src/plugins/media/spotify.lua

Load File

View Options

src/plugins/media/sticker.lua

Load File

View Options

src/plugins/media/youtube.lua

Load File

View Options

src/plugins/utility/about.lua

Load File

View Options

src/plugins/utility/afk.lua

Load File

View Options

src/plugins/utility/base64.lua

Load File

View Options

src/plugins/utility/bookmark.lua

Load File

View Options

src/plugins/utility/calc.lua

Load File

View Options

src/plugins/utility/commandstats.lua

Load File

View Options

src/plugins/utility/currency.lua

Load File

View Options

src/plugins/utility/github.lua

Load File

View Options

src/plugins/utility/growth.lua

Load File

View Options

src/plugins/utility/help.lua

Load File

View Options

src/plugins/utility/id.lua

Load File

View Options

src/plugins/utility/info.lua

Load File

View Options

src/plugins/utility/init.lua

Load File

View Options

src/plugins/utility/inline.lua

Load File

View Options

src/plugins/utility/karma.lua

Load File

View Options

src/plugins/utility/lastfm.lua

Load File

View Options

src/plugins/utility/nick.lua

Load File

View Options

src/plugins/utility/paste.lua

Load File

View Options

src/plugins/utility/ping.lua

Load File

View Options

src/plugins/utility/plugins.lua

Load File

View Options

src/plugins/utility/pokedex.lua

Load File

View Options

src/plugins/utility/remind.lua

Load File

View Options

src/plugins/utility/rss.lua

Load File

View Options

src/plugins/utility/schedule.lua

Load File

View Options

src/plugins/utility/search.lua

Load File

View Options

src/plugins/utility/sed.lua

Load File

View Options

src/plugins/utility/setlang.lua

Load File

View Options

src/plugins/utility/setloc.lua

Load File

View Options

src/plugins/utility/share.lua

Load File

View Options

src/plugins/utility/statistics.lua

Load File

View Options

src/plugins/utility/time.lua

Load File

View Options

src/plugins/utility/translate.lua

Load File

View Options

src/plugins/utility/urbandictionary.lua

Load File

View Options

src/plugins/utility/weather.lua

Load File

View Options

src/plugins/utility/wikipedia.lua

Load File

View Options

src/plugins/utility/xkcd.lua

Load File

Merge branch 'develop' into feat/router-expansion922d3bd3d5dcActions

Description

Details

Event Timeline

Merged Changes

Changes (140)Show All Changes

Very Large Commit

R69:922d3bd3d5dc

.env.example

.gitignore

CONTRIBUTING.md

README.md

docker-compose.matticate.yml

docker-compose.yml

main.lua

mattata-2.0-0.rockspec

mattata-2.2-0.rockspec

spec/helpers/mock_api.lua

spec/helpers/mock_redis.lua

spec/middleware/captcha_spec.lua

spec/plugins/admin/ban_spec.lua

spec/plugins/utility/help_spec.lua

spec/plugins/utility/ping_spec.lua

src/core/database.lua

src/core/http.lua

src/core/loader.lua

src/core/permissions.lua

src/core/redis.lua

src/core/router.lua

src/core/session.lua

src/db/init.lua

src/db/migrations/006_import_procedures.lua

src/middleware/captcha.lua

src/middleware/stats.lua

src/plugins/admin/addalias.lua

src/plugins/admin/addtrigger.lua

src/plugins/admin/administration.lua

src/plugins/admin/allowedlinks.lua

src/plugins/admin/allowlink.lua

src/plugins/admin/allowlist.lua

src/plugins/admin/antilink.lua

src/plugins/admin/antispam.lua

src/plugins/admin/autodelete.lua

src/plugins/admin/ban.lua

src/plugins/admin/blocklist.lua

src/plugins/admin/channel.lua

src/plugins/admin/customcaptcha.lua

src/plugins/admin/demote.lua

src/plugins/admin/federation/delfed.lua

src/plugins/admin/federation/fadmins.lua

src/plugins/admin/federation/fallowlist.lua

src/plugins/admin/federation/fban.lua

src/plugins/admin/federation/fbaninfo.lua

src/plugins/admin/federation/fdemote.lua

src/plugins/admin/federation/feds.lua

src/plugins/admin/federation/fpromote.lua

src/plugins/admin/federation/joinfed.lua

src/plugins/admin/federation/leavefed.lua

src/plugins/admin/federation/myfeds.lua

src/plugins/admin/federation/newfed.lua

src/plugins/admin/federation/unfban.lua

src/plugins/admin/filter.lua

src/plugins/admin/groups.lua

src/plugins/admin/import.lua

src/plugins/admin/init.lua

src/plugins/admin/join_captcha.lua

src/plugins/admin/kick.lua

src/plugins/admin/link.lua

src/plugins/admin/logchat.lua

src/plugins/admin/mute.lua

src/plugins/admin/nodelete.lua

src/plugins/admin/pin.lua

src/plugins/admin/promote.lua

src/plugins/admin/purge.lua

src/plugins/admin/report.lua

src/plugins/admin/rules.lua

src/plugins/admin/save.lua

src/plugins/admin/setcaptcha.lua

src/plugins/admin/setgrouplang.lua

src/plugins/admin/setwelcome.lua

Merge branch 'develop' into feat/router-expansion
922d3bd3d5dc
Actions

Changes (140)
Show All Changes