bcb89ada5e
* fix conversion from int to string yields a string of one rune, not a string of digits
* Add receipts table to syncapi
* Use StreamingToken as the since value
* Add required method to testEDUProducer
* Make receipt json creation "easier" to read
* Add receipts api to the eduserver
* Add receipts endpoint
* Add eduserver kafka consumer
* Add missing kafka config
* Add passing tests to whitelist
Signed-off-by: Till Faelligen <tfaelligen@gmail.com>
* Fix copy & paste error
* Fix column count error
* Make outbound federation receipts pass
* Make "Inbound federation rejects receipts from wrong remote" pass
* Don't use errors package
* - Add TODO for batching requests
- Rename variable
* Return a better error message
* - Use OutputReceiptEvent instead of InputReceiptEvent as result
- Don't use the errors package for errors
- Defer CloseAndLogIfError to close rows
- Fix Copyright
* Better creation/usage of JoinResponse
* Query all joined rooms instead of just one
* Update gomatrixserverlib
* Add sqlite3 migration
* Add postgres migration
* Ensure required sequence exists before running migrations
* Clarification on comment
* - Fix a bug when creating client receipts
- Use concrete types instead of interface{}
* Remove dead code
Use key for timestamp
* Fix postgres query...
* Remove single purpose struct
* Use key/value directly
* Only apply receipts on initial sync or if edu positions differ,
otherwise we'll be sending the same receipts over and over again.
* Actually update the id, so it is correctly send in syncs
* Set receipt on request to /read_markers
* Fix issue with receipts getting overwritten
* Use fmt.Errorf instead of pkg/errors
* Revert "Add postgres migration"
This reverts commit 722fe5a04628882b787d096942459961db159b06.
* Revert "Add sqlite3 migration"
This reverts commit d113b03f6495a4b8f8bcf158a3d00b510b4240cc.
* Fix selectRoomReceipts query
* Make golangci-lint happy
Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
88 lines
2.4 KiB
Go
88 lines
2.4 KiB
Go
// Copyright 2020 The Matrix.org Foundation C.I.C.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package api
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"time"
|
|
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
)
|
|
|
|
// SendTyping sends a typing event to EDU server
|
|
func SendTyping(
|
|
ctx context.Context, eduAPI EDUServerInputAPI, userID, roomID string,
|
|
typing bool, timeoutMS int64,
|
|
) error {
|
|
requestData := InputTypingEvent{
|
|
UserID: userID,
|
|
RoomID: roomID,
|
|
Typing: typing,
|
|
TimeoutMS: timeoutMS,
|
|
OriginServerTS: gomatrixserverlib.AsTimestamp(time.Now()),
|
|
}
|
|
|
|
var response InputTypingEventResponse
|
|
err := eduAPI.InputTypingEvent(
|
|
ctx, &InputTypingEventRequest{InputTypingEvent: requestData}, &response,
|
|
)
|
|
|
|
return err
|
|
}
|
|
|
|
// SendToDevice sends a typing event to EDU server
|
|
func SendToDevice(
|
|
ctx context.Context, eduAPI EDUServerInputAPI, sender, userID, deviceID, eventType string,
|
|
message interface{},
|
|
) error {
|
|
js, err := json.Marshal(message)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
requestData := InputSendToDeviceEvent{
|
|
UserID: userID,
|
|
DeviceID: deviceID,
|
|
SendToDeviceEvent: gomatrixserverlib.SendToDeviceEvent{
|
|
Sender: sender,
|
|
Type: eventType,
|
|
Content: js,
|
|
},
|
|
}
|
|
request := InputSendToDeviceEventRequest{
|
|
InputSendToDeviceEvent: requestData,
|
|
}
|
|
response := InputSendToDeviceEventResponse{}
|
|
return eduAPI.InputSendToDeviceEvent(ctx, &request, &response)
|
|
}
|
|
|
|
// SendReceipt sends a receipt event to EDU Server
|
|
func SendReceipt(
|
|
ctx context.Context,
|
|
eduAPI EDUServerInputAPI, userID, roomID, eventID, receiptType string,
|
|
timestamp gomatrixserverlib.Timestamp,
|
|
) error {
|
|
request := InputReceiptEventRequest{
|
|
InputReceiptEvent: InputReceiptEvent{
|
|
UserID: userID,
|
|
RoomID: roomID,
|
|
EventID: eventID,
|
|
Type: receiptType,
|
|
Timestamp: timestamp,
|
|
},
|
|
}
|
|
response := InputReceiptEventResponse{}
|
|
return eduAPI.InputReceiptEvent(ctx, &request, &response)
|
|
}
|