Skip to content

Commit 37cb5fb

Browse files
progvalprogval
committed
switch to stdreplies
1 parent 6b901dd commit 37cb5fb

File tree

1 file changed

+36
-46
lines changed

1 file changed

+36
-46
lines changed

‎files/metadata2.c

Lines changed: 36 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -25,44 +25,34 @@ module
2525

2626
/* this should go into include/numeric.h (was there at one point of time) */
2727

28-
#define RPL_WHOISKEYVALUE 760
29-
#define RPL_KEYVALUE 761
30-
#define RPL_METADATAEND 762
31-
#define ERR_METADATALIMIT 764
32-
#define ERR_TARGETINVALID 765
33-
#define ERR_NOMATCHINGKEY 766
34-
#define ERR_KEYINVALID 767
35-
#define ERR_KEYNOTSET 768
36-
#define ERR_KEYNOPERMISSION 769
37-
#define RPL_METADATASUBOK 770
38-
#define RPL_METADATAUNSUBOK 771
39-
#define RPL_METADATASUBS 772
40-
#define ERR_METADATATOOMANYSUBS 773
41-
#define ERR_METADATASYNCLATER 774
42-
#define ERR_METADATARATELIMIT 775
43-
#define ERR_METADATAINVALIDSUBCOMMAND 776
28+
#define RPL_WHOISKEYVALUE 760
29+
#define RPL_KEYVALUE 761
30+
#define RPL_METADATAEND 762
31+
#define RPL_KEYNOTSET 766
32+
#define RPL_METADATASUBOK 770
33+
#define RPL_METADATAUNSUBOK 771
34+
#define RPL_METADATASUBS 772
35+
#define RPL_METADATASYNCLATER 774
4436

4537
#define STR_RPL_WHOISKEYVALUE /* 760 */ "%s %s %s :%s"
46-
#define STR_RPL_KEYVALUE /* 761 */ "%s %s %s :%s"
47-
#define STR_RPL_METADATAEND /* 762 */ ":end of metadata"
48-
#define STR_ERR_METADATALIMIT /* 764 */ "%s :metadata limit reached"
49-
#define STR_ERR_TARGETINVALID /* 765 */ "%s :invalid metadata target"
50-
#define STR_ERR_NOMATCHINGKEY /* 766 */ "%s %s :no matching key"
51-
#define STR_ERR_KEYINVALID /* 767 */ ":%s"
52-
#define STR_ERR_KEYNOTSET /* 768 */ "%s %s :key not set"
53-
#define STR_ERR_KEYNOPERMISSION /* 769 */ "%s %s :permission denied"
38+
#define STR_RPL_KEYVALUE /* 761 */ "%s %s %s :%s"
39+
#define STR_RPL_METADATAEND /* 762 */ ":end of metadata"
40+
#define STR_RPL_KEYNOTSET /* 766 */ "%s %s :no matching key"
5441
#define STR_RPL_METADATASUBOK /* 770 */ ":%s"
5542
#define STR_RPL_METADATAUNSUBOK /* 771 */ ":%s"
5643
#define STR_RPL_METADATASUBS /* 772 */ ":%s"
57-
#define STR_ERR_METADATATOOMANYSUBS /* 773 */ "%s"
58-
#define STR_ERR_METADATASYNCLATER /* 774 */ "%s %s"
59-
#define STR_ERR_METADATARATELIMIT /* 775 */ "%s %s %s :%s"
60-
#define STR_ERR_METADATAINVALIDSUBCOMMAND /* 776 */ "%s :invalid metadata subcommand"
44+
#define STR_RPL_METADATASYNCLATER /* 774 */ "%s %s"
6145

62-
/* actual METADATA code */
46+
#define STR_FAIL_INVALID_TARGET ":%s FAIL METADATA INVALID_TARGET %s :invalid metadata target"
47+
#define STR_FAIL_INVALID_KEY ":%s FAIL METADATA INVALID_KEY %s :invalid key"
48+
#define STR_FAIL_INVALID_SUBCOMMAND ":%s FAIL METADATA INVALID_SUBCOMMAND %s :invalid metadata subcommand"
49+
#define STR_FAIL_KEY_NO_PERMISSION ":%s FAIL METADATA KEY_NO_PERMISSION %s %s :permission denied"
50+
#define STR_FAIL_KEY_NOT_SET ":%s FAIL METADATA KEY_NOT_SET %s :key not set"
51+
#define STR_FAIL_LIMIT_REACHED ":%s FAIL METADATA LIMIT_REACHED %s :metadata limit reached"
52+
#define STR_FAIL_RATE_LIMITED ":%s FAIL METADATA RATE_LIMITED %s :rate limited"
53+
#define STR_FAIL_TOO_MANY_SUBS ":%s FAIL METADATA TOO_MANY_SUBS %s :too many subscriptions"
6354

64-
#define STR_HELPER(x) #x
65-
#define STR(x) STR_HELPER(x)
55+
/* actual METADATA code */
6656

6757
/* get or set for perms */
6858
#define MODE_SET 0
@@ -90,7 +80,7 @@ module
9080
channel = find_channel(channame); \
9181
if (!channel) \
9282
{ \
93-
sendnumeric(client, ERR_NOSUCHNICK, channame); \
83+
sendto_one(client, NULL, STR_FAIL_INVALID_TARGET, me.name, channame); \
9484
return; \
9585
} \
9686
} else \
@@ -100,7 +90,7 @@ module
10090
user = hash_find_nickatserver(target, NULL); \
10191
if (!user) \
10292
{ \
103-
sendnumeric(client, ERR_NOSUCHNICK, target); \
93+
sendto_one(client, NULL, STR_FAIL_INVALID_TARGET, me.name, target); \
10494
return; \
10595
} \
10696
} else \
@@ -728,7 +718,7 @@ void metadata_set_user(Client *user, const char *key, const char *value, Client
728718
}
729719
if (!removed)
730720
{
731-
if(client) sendnumeric(client, ERR_KEYNOTSET, target_name, key); // not set so can't remove
721+
if(client) sendnumeric(client, RPL_KEYNOTSET, target_name, key); // not set so can't remove
732722
return;
733723
}
734724
} else
@@ -760,7 +750,7 @@ void metadata_set_user(Client *user, const char *key, const char *value, Client
760750
} else
761751
{ /* no more allowed */
762752
if (client)
763-
sendnumeric(client, ERR_METADATALIMIT, target_name);
753+
sendto_one(client, NULL, STR_FAIL_LIMIT_REACHED, me.name, target_name);
764754
return;
765755
}
766756
}
@@ -800,7 +790,7 @@ void metadata_set_channel(Channel *channel, const char *key, const char *value,
800790
if (!removed)
801791
{
802792
if (client)
803-
sendnumeric(client, ERR_KEYNOTSET, channel->name, key); /* not set so can't remove */
793+
sendto_one(client, NULL, STR_FAIL_KEY_NOT_SET, me.name, key);
804794
return;
805795
}
806796
} else { /* set */
@@ -831,7 +821,7 @@ void metadata_set_channel(Channel *channel, const char *key, const char *value,
831821
} else
832822
{ /* no more allowed */
833823
if (client)
834-
sendnumeric(client, ERR_METADATALIMIT, channel->name);
824+
sendto_one(client, NULL, STR_FAIL_LIMIT_REACHED, me.name, channel->name);
835825
return;
836826
}
837827
}
@@ -885,7 +875,7 @@ int metadata_subscribe(const char *key, Client *client, int remove)
885875
(*subs)->name = strdup(key);
886876
} else
887877
{ /* no more allowed */
888-
sendnumeric(client, ERR_METADATATOOMANYSUBS, key);
878+
sendto_one(client, NULL, STR_FAIL_TOO_MANY_SUBS, me.name, key);
889879
return 0;
890880
}
891881
}
@@ -939,7 +929,7 @@ void metadata_send_channel(Channel *channel, const char *key, Client *client)
939929
}
940930
}
941931
if (!found)
942-
sendnumeric(client, ERR_NOMATCHINGKEY, channel->name, key);
932+
sendnumeric(client, RPL_KEYNOTSET, channel->name, key);
943933
}
944934

945935
void metadata_send_user(Client *user, const char *key, Client *client)
@@ -961,7 +951,7 @@ void metadata_send_user(Client *user, const char *key, Client *client)
961951
}
962952
}
963953
if (!found)
964-
sendnumeric(client, ERR_NOMATCHINGKEY, user->name, key);
954+
sendnumeric(client, RPL_KEYNOTSET, user->name, key);
965955
}
966956

967957
void metadata_clear_channel(Channel *channel, Client *client)
@@ -1060,7 +1050,7 @@ int metadata_check_perms(Client *user, Channel *channel, Client *client, const c
10601050

10611051
}
10621052
if (key)
1063-
sendnumeric(client, ERR_KEYNOPERMISSION, user?user->name:channel->name, key);
1053+
sendto_one(client, NULL, STR_FAIL_KEY_NO_PERMISSION, me.name, user?user->name:channel->name, key);
10641054
return 0;
10651055
}
10661056

@@ -1092,7 +1082,7 @@ CMD_FUNC(cmd_metadata_local)
10921082
{
10931083
if (!metadata_key_valid(key))
10941084
{
1095-
sendnumeric(client, ERR_KEYINVALID, key);
1085+
sendto_one(client, NULL, STR_FAIL_INVALID_KEY, me.name, key);
10961086
continue;
10971087
}
10981088
if (channel)
@@ -1125,7 +1115,7 @@ CMD_FUNC(cmd_metadata_local)
11251115

11261116
if (!metadata_key_valid(key))
11271117
{
1128-
sendnumeric(client, ERR_KEYINVALID, key);
1118+
sendto_one(client, NULL, STR_FAIL_INVALID_KEY, me.name, key);
11291119
return;
11301120
}
11311121

@@ -1156,7 +1146,7 @@ CMD_FUNC(cmd_metadata_local)
11561146
metadata_subscribe(key, client, 0);
11571147
} else
11581148
{
1159-
sendnumeric(client, ERR_KEYINVALID, key);
1149+
sendto_one(client, NULL, STR_FAIL_INVALID_KEY, me.name, key);
11601150
continue;
11611151
}
11621152
}
@@ -1173,7 +1163,7 @@ CMD_FUNC(cmd_metadata_local)
11731163
metadata_subscribe(key, client, 1);
11741164
} else
11751165
{
1176-
sendnumeric(client, ERR_KEYINVALID, key);
1166+
sendto_one(client, NULL, STR_FAIL_INVALID_KEY, me.name, key);
11771167
continue;
11781168
}
11791169
}
@@ -1189,7 +1179,7 @@ CMD_FUNC(cmd_metadata_local)
11891179
PROCESS_TARGET_OR_DIE(target, user, channel, return);
11901180
} else
11911181
{
1192-
sendnumeric(client, ERR_METADATAINVALIDSUBCOMMAND, cmd);
1182+
sendto_one(client, NULL, STR_FAIL_INVALID_SUBCOMMAND, me.name, cmd);
11931183
}
11941184
}
11951185

0 commit comments

Comments
 (0)