- if (strchr(Channel_UserModes(Chan, cl), 'o'))
- strlcat(str, "@", sizeof(str));
- else if (strchr(Channel_UserModes(Chan, cl), 'v'))
- strlcat(str, "+", sizeof(str));
+ if (Client_Cap(cl) & CLIENT_CAP_MULTI_PREFIX) {
+ if (strchr(Channel_UserModes(Chan, cl), 'o') &&
+ strchr(Channel_UserModes(Chan, cl), 'v'))
+ strlcat(str, "@+", sizeof(str));
+ } else {
+ if (strchr(Channel_UserModes(Chan, cl), 'o'))
+ strlcat(str, "@", sizeof(str));
+ else if (strchr(Channel_UserModes(Chan, cl), 'v'))
+ strlcat(str, "+", sizeof(str));
+ }