diff options
| author | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2013-09-10 11:30:13 +0800 |
|---|---|---|
| committer | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2013-09-10 11:30:13 +0800 |
| commit | dc5030a39cca1f1a19ac4e7d4aff6c07ead562cb (patch) | |
| tree | 1249c3dbfd5e7d0a5b9a98c49253ba64e79bd377 | |
| parent | cb76ee2ab5c27764b5bf489428a1355f4f996a33 (diff) | |
| download | pttbbs-dc5030a39cca1f1a19ac4e7d4aff6c07ead562cb.tar pttbbs-dc5030a39cca1f1a19ac4e7d4aff6c07ead562cb.tar.gz pttbbs-dc5030a39cca1f1a19ac4e7d4aff6c07ead562cb.tar.bz2 pttbbs-dc5030a39cca1f1a19ac4e7d4aff6c07ead562cb.tar.lz pttbbs-dc5030a39cca1f1a19ac4e7d4aff6c07ead562cb.tar.xz pttbbs-dc5030a39cca1f1a19ac4e7d4aff6c07ead562cb.tar.zst pttbbs-dc5030a39cca1f1a19ac4e7d4aff6c07ead562cb.zip | |
Fix angelbeats: prevent adding angel activity accounts if that already have
masters.
git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5868 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
| -rwxr-xr-x | pttbbs/daemon/angelbeats/angel_perf.py | 4 | ||||
| -rw-r--r-- | pttbbs/daemon/angelbeats/angelbeats.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pttbbs/daemon/angelbeats/angel_perf.py b/pttbbs/daemon/angelbeats/angel_perf.py index da5d5151..d3bd77dd 100755 --- a/pttbbs/daemon/angelbeats/angel_perf.py +++ b/pttbbs/daemon/angelbeats/angel_perf.py @@ -52,8 +52,8 @@ def is_lazy(e): def is_all_reject2(e): # 'ALL_REJECT2' - '\033[1;31m以下是關呼叫統計比例過高([線上]減[關閉]與[停收]小於2)的小天使\033[m' - return (e.pause2 + e.pause1 >= e.sample - 1) + '\033[1;31m以下是關呼叫統計比例過高([線上]減[關閉]與[停收]小於5)的小天使\033[m' + return (e.pause2 + e.pause1 >= e.sample - 4) def parse_perf_file(filename): data = {} diff --git a/pttbbs/daemon/angelbeats/angelbeats.c b/pttbbs/daemon/angelbeats/angelbeats.c index 0677c65e..9e2304bb 100644 --- a/pttbbs/daemon/angelbeats/angelbeats.c +++ b/pttbbs/daemon/angelbeats/angelbeats.c @@ -424,7 +424,8 @@ init_angel_list_callback(void *ctx GCC_UNUSED, int uidx, userec_t *u) { userec_t xuser; int anum = _getuser(u->myangel, &xuser); - if (anum > 0 && (xuser.userlevel & PERM_ANGEL)) + if (anum > 0 && (xuser.userlevel & PERM_ANGEL) && + (!xuser.role & ROLE_ANGEL_ACTIVITY)) kanade = angel_list_add(xuser.userid, anum); } |