mirror of
https://github.com/ZoiteChat/zoitechat.git
synced 2026-08-31 20:39:24 +00:00
Compare commits
7 Commits
54514f494f
...
release/2.
| Author | SHA1 | Date | |
|---|---|---|---|
| 909309cc2e | |||
|
|
73d958911f | ||
| 6b4a2b5406 | |||
| cd8d1c9b10 | |||
|
|
a79fedda77 | ||
| 558ef7fbdf | |||
| 7c6609a414 |
2
.github/workflows/appimage-build.yml
vendored
2
.github/workflows/appimage-build.yml
vendored
@@ -2,7 +2,7 @@ name: AppImage Build
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [master]
|
branches: [master, 'release/**']
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [master]
|
branches: [master]
|
||||||
|
|
||||||
|
|||||||
2
.github/workflows/flatpak-build.yml
vendored
2
.github/workflows/flatpak-build.yml
vendored
@@ -2,7 +2,7 @@ name: Flatpak Build
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [master]
|
branches: [master, 'release/**']
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [master]
|
branches: [master]
|
||||||
|
|
||||||
|
|||||||
1
.github/workflows/windows-build.yml
vendored
1
.github/workflows/windows-build.yml
vendored
@@ -4,6 +4,7 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
|
- 'release/**'
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
|
|||||||
@@ -675,7 +675,8 @@ inbound_chanmsg (server *serv, session *sess, char *chan, char *from,
|
|||||||
|
|
||||||
if (fromme)
|
if (fromme)
|
||||||
{
|
{
|
||||||
if (prefs.hex_away_auto_unmark && serv->is_away && !tags_data->timestamp)
|
if (prefs.hex_away_auto_unmark && serv->is_away &&
|
||||||
|
(!tags_data->timestamp || serv->have_echo_message))
|
||||||
sess->server->p_set_back (sess->server);
|
sess->server->p_set_back (sess->server);
|
||||||
reply_context_print (sess, tags_data);
|
reply_context_print (sess, tags_data);
|
||||||
EMIT_SIGNAL_TIMESTAMP (XP_TE_UCHANMSG, sess, from, text, nickchar, NULL,
|
EMIT_SIGNAL_TIMESTAMP (XP_TE_UCHANMSG, sess, from, text, nickchar, NULL,
|
||||||
|
|||||||
@@ -3025,7 +3025,7 @@ cmd_msg (struct session *sess, char *tbuf, char *word[], char *word_eol[])
|
|||||||
newsess->server->nick, msg + offset, TRUE, FALSE,
|
newsess->server->nick, msg + offset, TRUE, FALSE,
|
||||||
&no_tags);
|
&no_tags);
|
||||||
}
|
}
|
||||||
else
|
else if (!sess->server->have_echo_message)
|
||||||
{
|
{
|
||||||
/* mask out passwords */
|
/* mask out passwords */
|
||||||
if (g_ascii_strcasecmp (nick, "nickserv") == 0)
|
if (g_ascii_strcasecmp (nick, "nickserv") == 0)
|
||||||
@@ -5058,6 +5058,11 @@ handle_user_input (session *sess, char *text, int history, int nocommand)
|
|||||||
handle_say (sess, text, TRUE);
|
handle_say (sess, text, TRUE);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
if (text[0] == cmd_char && text[1] == cmd_char)
|
||||||
|
{
|
||||||
|
handle_say (sess, text + 1, TRUE);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 1; text[i]; i++)
|
for (i = 1; text[i]; i++)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -373,10 +373,10 @@ begin
|
|||||||
idpClearFiles;
|
idpClearFiles;
|
||||||
|
|
||||||
if WizardIsComponentSelected('themes\windows10') then
|
if WizardIsComponentSelected('themes\windows10') then
|
||||||
idpAddFile('https://dl.zoitechat.zoite.net/themes/GTK3Themes/Windows-10-3.2.1.zip', ExpandConstant('{tmp}\Windows-10-3.2.1.zip'));
|
idpAddFile('https://dl.zoitechat.org/themes/GTK3Themes/Windows-10-3.2.1.zip', ExpandConstant('{tmp}\Windows-10-3.2.1.zip'));
|
||||||
|
|
||||||
if WizardIsComponentSelected('themes\windows10dark') then
|
if WizardIsComponentSelected('themes\windows10dark') then
|
||||||
idpAddFile('https://dl.zoitechat.zoite.net/themes/GTK3Themes/Windows-10-Dark-3.2.1-dark.zip', ExpandConstant('{tmp}\Windows-10-Dark-3.2.1-dark.zip'));
|
idpAddFile('https://dl.zoitechat.org/themes/GTK3Themes/Windows-10-Dark-3.2.1-dark.zip', ExpandConstant('{tmp}\Windows-10-Dark-3.2.1-dark.zip'));
|
||||||
|
|
||||||
if not WizardIsTaskSelected('portable') then
|
if not WizardIsTaskSelected('portable') then
|
||||||
begin
|
begin
|
||||||
|
|||||||
Reference in New Issue
Block a user