Skip to content
GitLab
Explorer
Connexion
Navigation principale
Rechercher ou aller à…
Projet
Matrix Gatcha Bot
Gestion
Activité
Membres
Labels
Programmation
Tickets
Tableaux des tickets
Jalons
Wiki externe
Code
Requêtes de fusion
Dépôt
Branches
Validations
Étiquettes
Graphe du dépôt
Comparer les révisions
Déploiement
Releases
Registre de modèles
Analyse
Expériences du modèle
Aide
Aide
Support
Documentation de GitLab
Comparer les forfaits GitLab
Forum de la communauté GitLab
Contribuer à GitLab
Donner votre avis
Raccourcis clavier
?
Extraits de code
Groupes
Projets
Ce projet est archivé. Le dépôt et les autres ressources du projet sont en lecture seule.
Afficher davantage de fils d'Ariane
Kubat
Matrix Gatcha Bot
Validations
ad40be18
Vérifiée
Valider
ad40be18
rédigé
Il y a 3 ans
par
Kubat
Parcourir les fichiers
Options
Téléchargements
Correctifs
Plain Diff
Clean the code + switch for reaction handler
parent
2408a998
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Modifications
3
Afficher les modifications d'espaces
En ligne
Côte à côte
Affichage de
3 fichiers modifiés
mgb.ini
+8
-7
8 ajouts, 7 suppressions
mgb.ini
src/config.rs
+8
-1
8 ajouts, 1 suppression
src/config.rs
src/matrix.rs
+80
-66
80 ajouts, 66 suppressions
src/matrix.rs
avec
96 ajouts
et
74 suppressions
mgb.ini
+
8
−
7
Voir le fichier @
ad40be18
[user]
id
=
"
@some_id:matrix.org
"
id
=
@some_id
\
:
matrix.org
password
=
no-password
display_name
=
MGB-Hitagi
[handler]
state_member
=
true
state_member
=
false
reaction
=
true
[basic]
name
=
basic package
acl
=
any
admins
=
@martin2018:iiens.net
admins
=
@some_id
\:
matrix.org
Ce diff est replié.
Cliquez pour l'agrandir.
src/config.rs
+
8
−
1
Voir le fichier @
ad40be18
...
...
@@ -12,6 +12,7 @@ pub struct Config {
pub
user_password
:
String
,
// The true user name
pub
handle_state_member
:
bool
,
// Install handler for state memver changes
pub
handle_reaction
:
bool
,
// Install handler for emoji reactions
ini_handler
:
Ini
,
}
...
...
@@ -49,6 +50,9 @@ pub fn from_file(file_name: &String) -> Result<Config, String> {
let
handle_state_member_str
=
conf
.get_from_or
(
Some
(
"handler"
),
"state_member"
,
"true"
)
.to_string
();
let
handle_reaction_str
=
conf
.get_from_or
(
Some
(
"handler"
),
"reaction"
,
"true"
)
.to_string
();
return
match
Url
::
parse
(
hs_url_str
)
{
Err
(
e
)
=>
Err
(
e
.to_string
()),
Ok
(
hs_url
)
=>
Ok
(
Config
{
...
...
@@ -64,6 +68,8 @@ pub fn from_file(file_name: &String) -> Result<Config, String> {
homeserver_url
:
hs_url
,
handle_state_member
:
<
bool
as
FromStr
>
::
from_str
(
&
handle_state_member_str
)
.unwrap_or
(
false
),
handle_reaction
:
<
bool
as
FromStr
>
::
from_str
(
&
handle_reaction_str
)
.unwrap_or
(
false
),
ini_handler
:
conf
,
}),
};
...
...
@@ -78,7 +84,8 @@ pub fn write_default(file_name: &String) -> Result<(), String> {
.set
(
"password"
,
"no-password"
)
.set
(
"display_name"
,
"MGB-Hitagi"
);
conf
.with_section
(
Some
(
"handler"
))
.set
(
"state_member"
,
"true"
);
.set
(
"state_member"
,
"false"
)
.set
(
"reaction"
,
"true"
);
conf
.with_section
(
Some
(
"basic"
))
.set
(
"name"
,
"basic package"
)
.set
(
"acl"
,
"any"
)
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
src/matrix.rs
+
80
−
66
Voir le fichier @
ad40be18
...
...
@@ -81,26 +81,45 @@ async fn startup_and_log_rooms(client: &Client) {
join_all
(
list_to_wait_for
)
.await
;
}
static
GLOBAL_PKG
:
SyncLazy
<
Arc
<
Mutex
<
Vec
<
CmdPackage
>>>>
=
SyncLazy
::
new
(||
Arc
::
new
(
Mutex
::
new
(
Vec
::
<
CmdPackage
>
::
new
())));
async
fn
on_msg_room_event
(
ev
:
SyncMessageEvent
<
MessageEventContent
>
,
room
:
Room
,
__info
:
Option
<
EncryptionInfo
>
,
)
{
let
sender_id
=
ev
.sender
.clone
();
return_if!
(
sender_id
.as_str
()
==
room
.own_user_id
()
.as_str
(),
());
pub
async
fn
connect_and_handle
(
config
:
Config
)
->
Result
<
()
>
{
// TODO: Refactor
let
pkg_commands_vec
=
vec!
[
Cmd
::
new_simple
(
format!
(
"ping"
),
0
,
Arc
::
new
(|
_x
|
true
)),
Cmd
::
new_echo
(
format!
(
"bot_name"
),
0
,
Arc
::
new
(
move
|
_x
|
format!
(
"toto"
))),
];
let
pkg
=
match
config
.section
(
"basic"
)
{
Some
(
section
)
=>
CmdPackage
::
from_config
(
&
section
,
pkg_commands_vec
),
None
=>
{
abort
();
if
let
(
Room
::
Joined
(
joined
),
MessageType
::
Text
(
TextMessageEventContent
{
ref
body
,
..
}))
=
(
room
,
ev
.content.msgtype
.clone
())
{
if
body
.starts_with
(
"%"
)
{
if
let
Some
(
stripped
)
=
body
.strip_prefix
(
"%"
)
{
let
args
=
stripped
.split
(
' '
)
.collect
::
<
Vec
<&
str
>>
();
let
mut
res
:
String
=
format!
(
"Command not found"
);
if
let
Some
(
pkg
)
=
GLOBAL_PKG
.lock
()
.unwrap
()
.iter
()
.find
(|
x
|
x
.has_command
(
&
args
))
{
res
=
pkg
.handle
(
&
joined
,
&
sender_id
,
args
);
}
let
event
=
ev
.into_full_event
(
joined
.room_id
()
.clone
());
let
msg
=
AnyMessageEventContent
::
RoomMessage
(
MessageEventContent
::
text_reply_html
(
res
.clone
(),
res
,
&
event
),
);
joined
.send
(
msg
,
None
)
.await
.unwrap
();
}
}
};
GLOBAL_PKG
.lock
()
.unwrap
()
.push
(
pkg
);
}
let
on_msg_room_reaction
=
|
ev
:
SyncMessageEvent
<
ReactionEventContent
>
,
async
fn
on_msg_room_reaction
(
ev
:
SyncMessageEvent
<
ReactionEventContent
>
,
room
:
Room
,
_
:
Option
<
EncryptionInfo
>
|
async
move
{
_
:
Option
<
EncryptionInfo
>
,
)
{
let
sender_id
=
ev
.sender
.clone
();
return_if!
(
sender_id
.as_str
()
==
room
.own_user_id
()
.as_str
(),
());
if
let
(
...
...
@@ -123,39 +142,35 @@ pub async fn connect_and_handle(config: Config) -> Result<()> {
));
joined
.send
(
msg
,
None
)
.await
.unwrap
();
};
};
}
let
on_msg_room_event
=
|
ev
:
SyncMessageEvent
<
MessageEventContent
>
,
room
:
Room
,
__info
:
Option
<
EncryptionInfo
>
|
async
{
let
sender_id
=
ev
.sender
.clone
();
return_if!
(
sender_id
.as_str
()
==
room
.own_user_id
()
.as_str
(),
());
static
GLOBAL_PKG
:
SyncLazy
<
Arc
<
Mutex
<
Vec
<
CmdPackage
>>>>
=
SyncLazy
::
new
(||
Arc
::
new
(
Mutex
::
new
(
Vec
::
<
CmdPackage
>
::
new
())));
if
let
(
Room
::
Joined
(
joined
),
MessageType
::
Text
(
TextMessageEventContent
{
ref
body
,
..
}))
=
(
room
,
ev
.content.msgtype
.clone
())
{
if
body
.starts_with
(
"%"
)
{
if
let
Some
(
stripped
)
=
body
.strip_prefix
(
"%"
)
{
let
args
=
stripped
.split
(
' '
)
.collect
::
<
Vec
<&
str
>>
();
let
mut
res
:
String
=
format!
(
"Command not found"
);
if
let
Some
(
pkg
)
=
GLOBAL_PKG
.lock
()
.unwrap
()
.iter
()
.find
(|
x
|
x
.has_command
(
&
args
))
{
res
=
pkg
.handle
(
&
joined
,
&
sender_id
,
args
);
macro_rules!
register_handler_if_enabled
{
(
$client
:
expr
,
$config
:
expr
,
$handler
:
expr
,
$handler_name
:
expr
)
=>
{{
if
(
$config
)
{
info!
(
"Handle {} events"
,
$handler_name
);
(
$client
)
.register_event_handler
(
$handler
)
.await
;
}
else
{
warn!
(
"Ignore {} events"
,
$handler_name
);
}
let
event
=
ev
.into_full_event
(
joined
.room_id
()
.clone
());
let
msg
=
AnyMessageEventContent
::
RoomMessage
(
MessageEventContent
::
text_reply_html
(
res
.clone
(),
res
,
&
event
),
);
joined
.send
(
msg
,
None
)
.await
.unwrap
();
}};
}
pub
async
fn
connect_and_handle
(
config
:
Config
)
->
Result
<
()
>
{
// TODO: Refactor
let
pkg_commands_vec
=
vec!
[
Cmd
::
new_simple
(
format!
(
"ping"
),
0
,
Arc
::
new
(|
_x
|
true
)),
Cmd
::
new_echo
(
format!
(
"bot_name"
),
0
,
Arc
::
new
(
move
|
_x
|
format!
(
"toto"
))),
];
let
pkg
=
match
config
.section
(
"basic"
)
{
Some
(
section
)
=>
CmdPackage
::
from_config
(
&
section
,
pkg_commands_vec
),
None
=>
{
abort
();
}
};
}
;
GLOBAL_PKG
.lock
()
.unwrap
()
.push
(
pkg
)
;
let
alice
=
UserId
::
try_from
(
config
.user_name
)
?
;
let
client
=
Client
::
new
(
config
.homeserver_url
)
?
;
...
...
@@ -171,14 +186,13 @@ pub async fn connect_and_handle(config: Config) -> Result<()> {
info!
(
"Logged as: {}"
,
alice
);
client
.sync_once
(
SyncSettings
::
default
())
.await
?
;
startup_and_log_rooms
(
&
client
)
.await
;
if
config
.handle_state_member
{
info!
(
"Handle state member events"
);
c
lient
.register_event_
handle
r
(
on
_state_member
)
.await
;
}
else
{
warn!
(
"Ignore
state member
events"
);
}
register_handler_if_enabled!
(
client
,
c
onfig
.
handle_state_member
,
on_state_member
,
"
state member
"
);
client
.register_event_handler
(
on_msg_room_event
)
.await
;
client
.register_event_handler
(
on_msg_room_reaction
)
.await
;
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
Aperçu
0%
Chargement en cours
Veuillez réessayer
ou
joindre un nouveau fichier
.
Annuler
You are about to add
0
people
to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Enregistrer le commentaire
Annuler
Veuillez vous
inscrire
ou vous
se connecter
pour commenter