manual update
This commit is contained in:
parent
2b1b6f4d7a
commit
8e12411a92
13 changed files with 36 additions and 74 deletions
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://akkoma.dev/AkkomaGang/pleroma-fe.git",
|
||||
"rev": "56fd2e773bf75066c44c8d20f458c53ffae4325f",
|
||||
"date": "2023-01-15T17:59:50+00:00",
|
||||
"path": "/nix/store/fgf0b8vgq4ny0kxn0y2cbzkvj55xlyca-pleroma-fe",
|
||||
"sha256": "0cfj4gaymjvp8avdv2y8c56sdadmmhrfgll9zwm5m3aniwk4a89f",
|
||||
"rev": "b4b13d777f7170c43cc3e5e73804897c207cf090",
|
||||
"date": "2023-01-27T10:08:17+00:00",
|
||||
"path": "/nix/store/ysdl7ycrx007k9qnczp0ivic7i1p6y0i-pleroma-fe",
|
||||
"sha256": "0b956a2agnypqs85yfp43p8vgvz304nqkvnwg947xvb4fvj8r7py",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://akkoma.dev/AkkomaGang/akkoma.git",
|
||||
"rev": "153539a246db7377d6af6bc8b5a7a4b4b9a3cdcd",
|
||||
"date": "2023-01-15T19:02:58+00:00",
|
||||
"path": "/nix/store/p8326rw3id7m4qmk9sdkn6gsl75lpwcw-akkoma",
|
||||
"sha256": "0xqgnrv5y7l49mgh1ryq1nijipflyvpqcq9nlxymymmmqq36b22b",
|
||||
"rev": "d601ddeb9153780e885918892a5017a0d0e2c400",
|
||||
"date": "2023-01-27T10:06:49+00:00",
|
||||
"path": "/nix/store/mskjfjmm4zn8p40fscwyhc5i89svhb8k-akkoma",
|
||||
"sha256": "006sqpkaz54gxcgwqk2ix5aypmgryhrmdsdifbji339rb0vnpp4z",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
12
flake.lock
12
flake.lock
|
@ -13,11 +13,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1674419074,
|
||||
"narHash": "sha256-qOhl5NUGJn4R49AsHQT1zlVihqKZJiRn7GdP/ObUiP8=",
|
||||
"lastModified": 1674800265,
|
||||
"narHash": "sha256-i9D3Ne4ktffiNfyM+jp7dOhRDkktm2SgtBCxkkFZP5E=",
|
||||
"owner": "zhaofengli",
|
||||
"repo": "attic",
|
||||
"rev": "9c8e9fbc35fe42b814ceb7482d5254ad3dad2c1e",
|
||||
"rev": "54d93ff61f98639d41d7897f7059aacabcb07772",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -105,11 +105,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1674564320,
|
||||
"narHash": "sha256-8WXsf9CXuGP01jU6HVrtxazQnsOcwy+XkC10MrRpHeY=",
|
||||
"lastModified": 1674984656,
|
||||
"narHash": "sha256-ckWTlwsjilHXKHXEcJRmo3ZQbXX0GQJt7RA5sdbQ6Vo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "23e9da2f6248b4c803bb899d61ffc7d03eec6ba4",
|
||||
"rev": "e831219a571ff15e887bbdda544b539902bfab61",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -17,7 +17,6 @@ in
|
|||
inherit (source) rev sha256;
|
||||
};
|
||||
patches = [
|
||||
./sticker.patch
|
||||
./no-category-spaces.patch
|
||||
];
|
||||
vendorSha256 = builtins.readFile ./vendor.sha256;
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/mautrix/discord",
|
||||
"rev": "e2bd89bd97c8aea88f1e203f906e7159348cb6b5",
|
||||
"date": "2023-01-20T15:07:18+02:00",
|
||||
"path": "/nix/store/96sxz6frbhyynjya1ff585vmzppq6aw8-discord",
|
||||
"sha256": "1na3qfji8662vjwbg4n4pw41y85b64d8g3fym59dqz02kllalkya",
|
||||
"rev": "10d26a7baa7289bc1b8ea73692615f2b22335f49",
|
||||
"date": "2023-01-29T02:13:02+02:00",
|
||||
"path": "/nix/store/cb5hhfkmv6l22rlsyqmmgr9819nv4r1p-discord",
|
||||
"sha256": "03q7zb75lnl7ncps2hiwnhd9zp0r7cmjxaakv2vl3k6fq0d84073",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
@ -1,37 +0,0 @@
|
|||
diff --git a/portal.go b/portal.go
|
||||
index 3907859..25e0dc2 100644
|
||||
--- a/portal.go
|
||||
+++ b/portal.go
|
||||
@@ -920,7 +920,7 @@ func (portal *Portal) sendMatrixMessage(intent *appservice.IntentAPI, eventType
|
||||
|
||||
func (portal *Portal) handleMatrixMessages(msg portalMatrixMessage) {
|
||||
switch msg.evt.Type {
|
||||
- case event.EventMessage:
|
||||
+ case event.EventMessage, event.EventSticker:
|
||||
portal.handleMatrixMessage(msg.user, msg.evt)
|
||||
case event.EventRedaction:
|
||||
portal.handleMatrixRedaction(msg.user, msg.evt)
|
||||
@@ -1184,13 +1184,22 @@ func (portal *Portal) handleMatrixMessage(sender *User, evt *event.Event) {
|
||||
}
|
||||
}
|
||||
sendReq.Content = portal.parseMatrixHTML(sender, content)
|
||||
- case event.MsgAudio, event.MsgFile, event.MsgImage, event.MsgVideo:
|
||||
+ case event.MsgAudio, event.MsgFile, event.MsgImage, event.MsgVideo, "": // MsgType is empty when the message is a sticker
|
||||
data, err := portal.downloadMatrixAttachment(content)
|
||||
if err != nil {
|
||||
go portal.sendMessageMetrics(evt, err, "Error downloading media in")
|
||||
return
|
||||
}
|
||||
|
||||
+ // extract file suffix from mime type
|
||||
+ mimeParts := strings.Split(content.Info.MimeType, "/")
|
||||
+
|
||||
+ if content.MsgType == "" {
|
||||
+ // the Body doesn’t contain the file name for stickers
|
||||
+ content.Body = "sticker."
|
||||
+ content.Body += mimeParts[1]
|
||||
+ }
|
||||
+
|
||||
sendReq.Files = []*discordgo.File{{
|
||||
Name: content.Body,
|
||||
ContentType: content.Info.MimeType,
|
|
@ -1 +1 @@
|
|||
sha256-rPY2YR8yk/XFCVKRsP1+M35VW3qAl/8HxSTn2gRCc7Q=
|
||||
sha256-NSwmgtzIqQadWetep28U78Ukodhk1jGlr9VriCB9qUE=
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/mautrix/signal",
|
||||
"rev": "b82ba60cb4784c8bf17e30b6633f8b8004799829",
|
||||
"date": "2023-01-16T17:28:13-07:00",
|
||||
"path": "/nix/store/w1fpcb6rzs7zhg0y4cilg76fbw7b6pfm-signal",
|
||||
"sha256": "0pkz9n8fd23gymqw8256i668j7i8jx8h2ljnjqdjcgmpffqiyfpa",
|
||||
"rev": "bbd6f7cd6647581b747ef1847d47b2572d4bf886",
|
||||
"date": "2023-01-28T12:34:52+02:00",
|
||||
"path": "/nix/store/r0plmrymg9xmv4r35qaq93l9vx5ph55j-signal",
|
||||
"sha256": "18xwdlxqfqgyi0yn62lydq8jpq4brig3h67bbq8z2ynmv5y7axr9",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/mautrix/telegram",
|
||||
"rev": "e655e0a8826eb66e3f133cfe6ab912d275a55715",
|
||||
"date": "2023-01-18T14:28:12+02:00",
|
||||
"path": "/nix/store/yy6ln6582x1i1c8nbcfpv4408sqh939p-telegram",
|
||||
"sha256": "0pg88x8icljs8rmn4c8q8ipaqqr4knkczl11id65sjygzcdi0r8h",
|
||||
"rev": "f12abbe03846fd5897d58572ab24b70a58b337d2",
|
||||
"date": "2023-01-27T18:40:35+02:00",
|
||||
"path": "/nix/store/id27bq50awvra8f1yimnfkd83v3rwww8-telegram",
|
||||
"sha256": "0hwilp5x2zh1fnvbad2bh0vyar7f0n5h1qbcmfxfsk56agj7r5p5",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/mautrix/whatsapp",
|
||||
"rev": "da0fb48eb271ff202c5734f8549b48324739b063",
|
||||
"date": "2023-01-16T17:17:36+02:00",
|
||||
"path": "/nix/store/wm260512m80sigsrpz19zg0cnabcrf42-whatsapp",
|
||||
"sha256": "1rrirkccg35a6gav6gi7iqxf7cws1lf4kx0851nml4xn57fnwcjl",
|
||||
"rev": "e5d32cc1e2b2bec4ff79fe34ce89c8e0e49e4041",
|
||||
"date": "2023-01-28T21:51:40+02:00",
|
||||
"path": "/nix/store/cn7lzrbqvi8vn16nb7jh7nw692avgi2a-whatsapp",
|
||||
"sha256": "0c8fidr8ks97qany3bvk1377s3hpmpdcdpm1i1gmjsz7ak4nq9dq",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
@ -1 +1 @@
|
|||
sha256-ijy+/Ov5AVAhnibtNChZFgqTBxU6UFrHkZmF6gCd4ok=
|
||||
sha256-fpyYEhE6g81cnd3a70wxi7C104UHMWGwFiLfDmeL37Q=
|
||||
|
|
|
@ -12,11 +12,11 @@
|
|||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "mautrix";
|
||||
version = "0.19.2";
|
||||
version = "0.19.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-dmE9GPRnJlDA7KfGyo3O+ZOj2qXYv2AKZatvoGayhZE=";
|
||||
sha256 = "sha256-xgMcEqiafstnfcVkP8UKM35IllEw7yfhSwNrfQJh6y0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -9,11 +9,11 @@
|
|||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "tulir-telethon";
|
||||
version = "1.27.0a6";
|
||||
version = "1.27.0a7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-xoMVfno7WCuqkncbuMjYdycbMm8vnv23NmjtON9RLO8=";
|
||||
sha256 = "sha256-w4WILvLvJBKf3Nlj0omTCDDD4z+b0XFlCplQ/IHwIPs=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
Reference in a new issue