all: delete legacy bridge

.gitignore

@@ -6,7 +6,5 @@
 *.log*
 
 /mautrix-signal
-/mautrix-signalgo
-/mautrix-signal-v2
 /start
 /libsignal_ffi.a

.gitlab-ci.yml

@@ -1,17 +1,12 @@
 include:
-- project: 'mautrix/ci'
- file: '/go.yml'
 - project: 'mautrix/ci'
  file: '/gov2.yml'
 
 variables:
  BUILDER_IMAGE: dock.mau.dev/tulir/gomuks-build-docker/signal
+ BINARY_NAME_V2: mautrix-signal
 
 # 32-bit arm builds aren't supported
-build arm:
- rules:
- - when: never
-
 build arm v2:
  rules:
  - when: never

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
  - repo: https://github.com/pre-commit/pre-commit-hooks
- rev: v4.5.0
+ rev: v4.6.0
  hooks:
  - id: trailing-whitespace
  exclude_types: [markdown]
@@ -18,11 +18,11 @@ repos:
  - "go.mau.fi/mautrix-signal"
  - "-w"
  - id: go-vet-mod
- #- id: go-staticcheck-repo-mod
+# - id: go-staticcheck-repo-mod
  # TODO: reenable this and fix all the problems
 
  - repo: https://github.com/beeper/pre-commit-go
- rev: v0.3.0
+ rev: v0.3.1
  hooks:
  - id: zerolog-ban-msgf
  - id: zerolog-use-stringer

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.7.0 (unreleased)
+
+* Updated to libsignal v0.54.0.
+* Rewrote bridge using bridgev2 architecture.
+ * It is recommended to check the config file after upgrading.
+
 # v0.6.3 (2024-07-16)
 
 * Updated to libsignal v0.52.0.

ROADMAP.md

@@ -1,17 +1,17 @@
 # Features & roadmap
 
 * Matrix → Signal
- * [ ] Message content
+ * [x] Message content
  * [x] Text
  * [x] Formatting
  * [x] Mentions
- * [ ] Media
+ * [x] Media
  * [x] Images
  * [x] Audio files
  * [x] Voice messages
  * [x] Files
  * [x] Gifs
- * [ ] Locations
+ * [x] Locations
  * [x] Stickers
  * [x] Message edits
  * [x] Message reactions
@@ -22,9 +22,9 @@
  * [x] Topic
  * [ ] Membership actions
  * [ ] Join (accepting invites)
- * [x] Invite
- * [x] Leave
- * [x] Kick/Ban/Unban
+ * [ ] Invite
+ * [ ] Leave
+ * [ ] Kick/Ban/Unban
  * [x] Group permissions
  * [x] Typing notifications
  * [x] Read receipts
@@ -70,5 +70,5 @@
  * [x] When receiving message
  * [x] Linking as secondary device
  * [ ] Registering as primary device
- * [x] Private chat/group creation by inviting Matrix puppet of Signal user to new room
+ * [ ] Private chat/group creation by inviting Matrix puppet of Signal user to new room
  * [x] Option to use own Matrix account for messages sent from other Signal clients

build-go.sh

@@ -1,9 +1,9 @@
 #!/bin/sh
 MAUTRIX_VERSION=$(cat go.mod | grep 'maunium.net/go/mautrix ' | awk '{ print $2 }')
-GO_LDFLAGS="-X main.Tag=$(git describe --exact-match --tags 2>/dev/null) -X main.Commit=$(git rev-parse HEAD) -X 'main.BuildTime=`date '+%b %_d %Y, %H:%M:%S'`' -X 'maunium.net/go/mautrix.GoModVersion=$MAUTRIX_VERSION'"
+GO_LDFLAGS="-X main.Tag=$(git describe --exact-match --tags 2>/dev/null) -X main.Commit=$(git rev-parse HEAD) -X 'main.BuildTime=`date -Iseconds`' -X 'maunium.net/go/mautrix.GoModVersion=$MAUTRIX_VERSION'"
 if [ "$DBG" = 1 ]; then
  GO_GCFLAGS='all=-N -l'
 else
  GO_LDFLAGS="-s -w ${GO_LDFLAGS}"
 fi
-go build -gcflags="$GO_GCFLAGS" -ldflags="$GO_LDFLAGS" -o mautrix-signal "$@"
+go build -gcflags="$GO_GCFLAGS" -ldflags="$GO_LDFLAGS" -o mautrix-signal ./cmd/mautrix-signal "$@"

build-v2.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
-#./build-rust.sh
-#cp -f pkg/libsignalgo/libsignal/target/release/libsignal_ffi.a .
-LIBRARY_PATH=.:$LIBRARY_PATH ./build-go-v2.sh
+./build-rust.sh
+cp -f pkg/libsignalgo/libsignal/target/release/libsignal_ffi.a .
+LIBRARY_PATH=.:$LIBRARY_PATH ./build-go.sh