kai/farmcal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Matrix-Nachrichtenabruf auf /rooms/{roomId}/messages umstellen

Browse Source
This commit is contained in:
Kai
2026-02-17 16:22:32 +01:00
parent 234bd7e182
commit 18cbc27ec3
1 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
cmd/server/matrix.go
View File

@@ -48,8 +48,12 @@ func newMatrixClientFromEnv() *MatrixClient {
} }
func (m *MatrixClient) FetchRecentMessages(ctx context.Context) ([]MatrixMessage, error) { func (m *MatrixClient) FetchRecentMessages(ctx context.Context) ([]MatrixMessage, error) {
filter := fmt.Sprintf(`{"room":{"rooms":["%s"],"timeline":{"limit":%d}}}`, m.RoomID, m.Limit) endpoint := fmt.Sprintf(
endpoint := m.HomeserverURL + "/_matrix/client/v3/sync?timeout=0&filter=" + url.QueryEscape(filter) "%s/_matrix/client/v3/rooms/%s/messages?dir=b&limit=%d",
m.HomeserverURL,
url.PathEscape(m.RoomID),
m.Limit,
)
req, err := http.NewRequestWithContext(ctx, http.MethodGet, endpoint, nil) req, err := http.NewRequestWithContext(ctx, http.MethodGet, endpoint, nil)
if err != nil { if err != nil {
@@ -66,11 +70,8 @@ func (m *MatrixClient) FetchRecentMessages(ctx context.Context) ([]MatrixMessage
return nil, errors.New("matrix sync failed: " + strconv.Itoa(resp.StatusCode)) return nil, errors.New("matrix sync failed: " + strconv.Itoa(resp.StatusCode))
} }
var syncResp struct { var messagesResp struct {
Rooms struct { Chunk []struct {
Join map[string]struct {
Timeline struct {
Events []struct {
Type string `json:"type"` Type string `json:"type"`
Sender string `json:"sender"` Sender string `json:"sender"`
OriginServerTS int64 `json:"origin_server_ts"` OriginServerTS int64 `json:"origin_server_ts"`
@@ -78,25 +79,20 @@ func (m *MatrixClient) FetchRecentMessages(ctx context.Context) ([]MatrixMessage
MsgType string `json:"msgtype"` MsgType string `json:"msgtype"`
Body string `json:"body"` Body string `json:"body"`
} `json:"content"` } `json:"content"`
} `json:"events"` } `json:"chunk"`
} `json:"timeline"`
} `json:"join"`
} `json:"rooms"`
} }
if err := json.NewDecoder(resp.Body).Decode(&syncResp); err != nil { if err := json.NewDecoder(resp.Body).Decode(&messagesResp); err != nil {
return nil, err return nil, err
} }
if len(messagesResp.Chunk) == 0 {
room, ok := syncResp.Rooms.Join[m.RoomID]
if !ok {
return []MatrixMessage{}, nil return []MatrixMessage{}, nil
} }
out := make([]MatrixMessage, 0, len(room.Timeline.Events)) out := make([]MatrixMessage, 0, len(messagesResp.Chunk))
for _, ev := range room.Timeline.Events { for i := len(messagesResp.Chunk) - 1; i >= 0; i-- {
if ev.Type != "m.room.message" { ev := messagesResp.Chunk[i]
continue switch ev.Type {
} case "m.room.message":
if ev.Content.MsgType != "m.text" && ev.Content.MsgType != "m.notice" { if ev.Content.MsgType != "m.text" && ev.Content.MsgType != "m.notice" {
continue continue
} }
@@ -110,6 +106,14 @@ func (m *MatrixClient) FetchRecentMessages(ctx context.Context) ([]MatrixMessage
Body: body, Body: body,
Timestamp: ts, Timestamp: ts,
}) })
case "m.room.encrypted":
ts := time.UnixMilli(ev.OriginServerTS).Local().Format("02.01.2006 15:04")
out = append(out, MatrixMessage{
Sender: ev.Sender,
Body: "[Verschlüsselte Nachricht]",
Timestamp: ts,
})
}
} }
return out, nil return out, nil
} }