thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow audio clip uploads

Browse source
This commit is contained in:
Konstantinos Sideris 2017-12-01 17:33:49 +02:00
parent 78353a29bc
commit 5573548fb1
18 changed files with 168 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/MatrixClient.h
View file

@ -17,6 +17,7 @@
#pragma once
#include <QFileInfo>
#include <QNetworkAccessManager>
#include <QUrl>
@ -43,6 +44,7 @@ public:
int txnId,
const QString &roomid,
const QString &msg,
const QFileInfo &info,
const QString &url = "") noexcept;
void login(const QString &username, const QString &password) noexcept;
void registerUser(const QString &username,
@ -57,6 +59,7 @@ public:
void messages(const QString &room_id, const QString &from_token, int limit = 30) noexcept;
void uploadImage(const QString &roomid, const QString &filename);
void uploadFile(const QString &roomid, const QString &filename);
void uploadAudio(const QString &roomid, const QString &filename);
void joinRoom(const QString &roomIdOrAlias);
void leaveRoom(const QString &roomId);
void sendTypingNotification(const QString &roomid, int timeoutInMillis = 20000);
@ -94,6 +97,7 @@ signals:
void versionSuccess();
void imageUploaded(const QString &roomid, const QString &filename, const QString &url);
void fileUploaded(const QString &roomid, const QString &filename, const QString &url);
void audioUploaded(const QString &roomid, const QString &filename, const QString &url);
void roomAvatarRetrieved(const QString &roomid, const QPixmap &img);
void userAvatarRetrieved(const QString &userId, const QImage &img);
@ -116,6 +120,8 @@ signals:
void leftRoom(const QString &room_id);
private:
QNetworkReply *makeUploadRequest(const QString &filename);
// Client API prefix.
QString clientApiUrl_;

3
include/TextInputWidget.h
View file

@ -85,8 +85,11 @@ private slots:
signals:
void sendTextMessage(QString msg);
void sendEmoteMessage(QString msg);
void uploadImage(QString filename);
void uploadFile(QString filename);
void uploadAudio(QString filename);
void sendJoinRoomRequest(const QString &room);
void startedTyping();

2
include/events/MessageEvent.h
View file

@ -55,7 +55,7 @@ struct ThumbnailInfo
{
int h;
int w;
int size;
int size = 0;
QString mimetype;
};

2
include/events/messages/Audio.h
View file

@ -27,7 +27,7 @@ namespace messages {
struct AudioInfo
{
uint64_t duration;
int size;
int size = 0;
QString mimetype;
};

2
include/events/messages/File.h
View file

@ -27,7 +27,7 @@ namespace events {
namespace messages {
struct FileInfo
{
int size;
int size = 0;
QString mimetype;
QString thumbnail_url;

2
include/events/messages/Image.h
View file

@ -29,7 +29,7 @@ struct ImageInfo
{
int h;
int w;
int size;
int size = 0;
QString mimetype;
QString thumbnail_url;

2
include/events/messages/Video.h
View file

@ -29,7 +29,7 @@ struct VideoInfo
{
int h;
int w;
int size;
int size = 0;
int duration;
QString mimetype;

1
include/timeline/TimelineViewManager.h
View file

@ -68,6 +68,7 @@ public slots:
void queueEmoteMessage(const QString &msg);
void queueImageMessage(const QString &roomid, const QString &filename, const QString &url);
void queueFileMessage(const QString &roomid, const QString &filename, const QString &url);
void queueAudioMessage(const QString &roomid, const QString &filename, const QString &url);
private slots:
void messageSent(const QString &eventid, const QString &roomid, int txnid);