inga-lovinde
/
FLocal
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Post.exportToXml refactored; posts hiding logic improved

Browse Source
main
Inga 🏳‍🌈 14 years ago
parent 0621e83206
commit 8252fcdbfc
15 changed files with 25 additions and 23 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      Builder/IISMainHandler/build.txt
  2. 2
      Common/dataobjects/Board.cs
  3. 14
      Common/dataobjects/Post.cs
  4. 2
      IISMainHandler/handlers/PostHandler.cs
  5. 2
      IISMainHandler/handlers/ThreadHandler.cs
  6. 2
      IISMainHandler/handlers/request/CreateThreadHandler.cs
  7. 2
      IISMainHandler/handlers/request/EditHandler.cs
  8. 2
      IISMainHandler/handlers/request/ReplyHandler.cs
  9. 2
      IISMainHandler/handlers/response/AllPostsHandler.cs
  10. 6
      IISMainHandler/handlers/response/BoardAsThread.cs
  11. 2
      IISMainHandler/handlers/response/EditHandler.cs
  12. 2
      IISMainHandler/handlers/response/PMReplyToPostHandler.cs
  13. 2
      IISMainHandler/handlers/response/ReplyHandler.cs
  14. 2
      IISMainHandler/handlers/response/UserPostsHandler.cs
  15. 2
      IISMainHandler/handlers/response/UserRepliesHandler.cs

2
Builder/IISMainHandler/build.txt
Unescape View File

@ -1 +1 @@
954 956

2
Common/dataobjects/Board.cs
Unescape View File

@ -188,7 +188,7 @@ namespace FLocal.Common.dataobjects {
if(!this.lastPostId.HasValue) { if(!this.lastPostId.HasValue) {
return new XElement("none"); return new XElement("none");
} else { } else {
return this.lastPost.exportToXml(context, false); return this.lastPost.exportToXml(context);
} }
} }

14
Common/dataobjects/Post.cs
Unescape View File

@ -175,11 +175,19 @@ namespace FLocal.Common.dataobjects {
); );
} }
public XElement exportToXmlBase(UserContext context) {
return new XElement("post",
new XElement("id", this.id),
new XElement("poster", this.poster.exportToXmlForViewing(context)),
new XElement("bodyShort", context.isPostVisible(this) ? this.bodyShort : "")
);
}
private XNode XMLBody(UserContext context) { private XNode XMLBody(UserContext context) {
return XElement.Parse("<body>" + context.outputParams.preprocessBodyIntermediate(this.body) + "</body>", LoadOptions.PreserveWhitespace); return XElement.Parse("<body>" + context.outputParams.preprocessBodyIntermediate(this.body) + "</body>", LoadOptions.PreserveWhitespace);
} }
public XElement exportToXml(UserContext context, bool includeParentPost, params XElement[] additional) { public XElement exportToXml(UserContext context, params XElement[] additional) {
if(!context.isPostVisible(this)) return null; if(!context.isPostVisible(this)) return null;
@ -204,10 +212,8 @@ namespace FLocal.Common.dataobjects {
) )
) )
); );
if(includeParentPost) {
if(this.parentPostId.HasValue) { if(this.parentPostId.HasValue) {
result.Add(new XElement("parentPost", this.parentPost.exportToXml(context, false))); result.Add(new XElement("parentPost", this.parentPost.exportToXmlBase(context)));
}
} }
if(additional.Length > 0) { if(additional.Length > 0) {
result.Add(additional); result.Add(additional);

2
IISMainHandler/handlers/PostHandler.cs
Unescape View File

@ -29,7 +29,7 @@ namespace FLocal.IISHandler.handlers {
XElement[] result = new XElement[] { XElement[] result = new XElement[] {
new XElement("currentLocation", post.exportToXmlSimpleWithParent(context)), new XElement("currentLocation", post.exportToXmlSimpleWithParent(context)),
post.thread.exportToXml(context), post.thread.exportToXml(context),
new XElement("posts", post.exportToXml(context, true, new XElement("isUnread", (post.id > lastReadId).ToPlainString()))) new XElement("posts", post.exportToXml(context, new XElement("isUnread", (post.id > lastReadId).ToPlainString())))
}; };
post.thread.incrementViewsCounter(); post.thread.incrementViewsCounter();

2
IISMainHandler/handlers/ThreadHandler.cs
Unescape View File

@ -59,7 +59,7 @@ namespace FLocal.IISHandler.handlers {
new XElement("currentLocation", thread.exportToXmlSimpleWithParent(context)), new XElement("currentLocation", thread.exportToXmlSimpleWithParent(context)),
thread.exportToXml(context), thread.exportToXml(context),
new XElement("posts", new XElement("posts",
from post in posts select post.exportToXml(context, true, new XElement("isUnread", (post.id > lastReadId).ToPlainString())), from post in posts select post.exportToXml(context, new XElement("isUnread", (post.id > lastReadId).ToPlainString())),
pageOuter.exportToXml(2, 5, 2) pageOuter.exportToXml(2, 5, 2)
) )
}; };

2
IISMainHandler/handlers/request/CreateThreadHandler.cs
Unescape View File

@ -25,7 +25,7 @@ namespace FLocal.IISHandler.handlers.request {
return new XElement[] { return new XElement[] {
newThread.board.exportToXml(context, false), newThread.board.exportToXml(context, false),
newPost.exportToXml(context, false) newPost.exportToXml(context)
}; };
} }
} }

2
IISMainHandler/handlers/request/EditHandler.cs
Unescape View File

@ -17,7 +17,7 @@ namespace FLocal.IISHandler.handlers.request {
protected override XElement[] Do(WebContext context) { protected override XElement[] Do(WebContext context) {
Post post = Post.LoadById(int.Parse(context.httprequest.Form["postId"])); Post post = Post.LoadById(int.Parse(context.httprequest.Form["postId"]));
XElement postXml = post.exportToXml(context, false); XElement postXml = post.exportToXml(context);
post.Edit( post.Edit(
context.session.account.user, context.session.account.user,
this.getTitle(context), this.getTitle(context),

2
IISMainHandler/handlers/request/ReplyHandler.cs
Unescape View File

@ -25,7 +25,7 @@ namespace FLocal.IISHandler.handlers.request {
return new XElement[] { return new XElement[] {
newPost.thread.board.exportToXml(context, false), newPost.thread.board.exportToXml(context, false),
newPost.exportToXml(context, false) newPost.exportToXml(context)
}; };
} }

2
IISMainHandler/handlers/response/AllPostsHandler.cs
Unescape View File

@ -49,7 +49,7 @@ namespace FLocal.IISHandler.handlers.response {
XElement[] result = new XElement[] { XElement[] result = new XElement[] {
new XElement("posts", new XElement("posts",
from post in posts select post.exportToXml(context, true), from post in posts select post.exportToXml(context),
pageOuter.exportToXml(2, 5, 2) pageOuter.exportToXml(2, 5, 2)
) )
}; };

6
IISMainHandler/handlers/response/BoardAsThread.cs
Unescape View File

@ -36,11 +36,7 @@ namespace FLocal.IISHandler.handlers.response {
new XElement("posts", new XElement("posts",
from thread in threads select thread.firstPost.exportToXml( from thread in threads select thread.firstPost.exportToXml(
context, context,
false, new XElement("specific", thread.exportToXml(context))
new XElement(
"specific",
thread.exportToXml(context)
)
), ),
pageOuter.exportToXml(1, 5, 1) pageOuter.exportToXml(1, 5, 1)
) )

2
IISMainHandler/handlers/response/EditHandler.cs
Unescape View File

@ -24,7 +24,7 @@ namespace FLocal.IISHandler.handlers.response {
return new XElement[] { return new XElement[] {
post.thread.board.exportToXml(context, false), post.thread.board.exportToXml(context, false),
post.thread.exportToXml(context), post.thread.exportToXml(context),
post.exportToXml(context, false), post.exportToXml(context),
post.latestRevision.exportToXml(context), post.latestRevision.exportToXml(context),
new XElement("layers", new XElement("layers",
from layer in PostLayer.allLayers select layer.exportToXml(context) from layer in PostLayer.allLayers select layer.exportToXml(context)

2
IISMainHandler/handlers/response/PMReplyToPostHandler.cs
Unescape View File

@ -33,7 +33,7 @@ namespace FLocal.IISHandler.handlers.response {
return new XElement[] { return new XElement[] {
post.thread.board.exportToXml(context, false), post.thread.board.exportToXml(context, false),
post.thread.exportToXml(context), post.thread.exportToXml(context),
post.exportToXml(context, false), post.exportToXml(context),
new XElement("receiver", Account.LoadByUser(post.poster).exportToXml(context)), new XElement("receiver", Account.LoadByUser(post.poster).exportToXml(context)),
new XElement("quoted", quoted), new XElement("quoted", quoted),
}; };

2
IISMainHandler/handlers/response/ReplyHandler.cs
Unescape View File

@ -33,7 +33,7 @@ namespace FLocal.IISHandler.handlers.response {
return new XElement[] { return new XElement[] {
post.thread.board.exportToXml(context, false), post.thread.board.exportToXml(context, false),
post.thread.exportToXml(context), post.thread.exportToXml(context),
post.exportToXml(context, false), post.exportToXml(context),
new XElement("layers", new XElement("layers",
from layer in PostLayer.allLayers select layer.exportToXml(context) from layer in PostLayer.allLayers select layer.exportToXml(context)
), ),

2
IISMainHandler/handlers/response/UserPostsHandler.cs
Unescape View File

@ -32,7 +32,7 @@ namespace FLocal.IISHandler.handlers.response {
XElement[] result = new XElement[] { XElement[] result = new XElement[] {
user.exportToXmlForViewing(context), user.exportToXmlForViewing(context),
new XElement("posts", new XElement("posts",
from post in posts select post.exportToXml(context, true), from post in posts select post.exportToXml(context),
pageOuter.exportToXml(2, 5, 2) pageOuter.exportToXml(2, 5, 2)
) )
}; };

2
IISMainHandler/handlers/response/UserRepliesHandler.cs
Unescape View File

@ -32,7 +32,7 @@ namespace FLocal.IISHandler.handlers.response {
XElement[] result = new XElement[] { XElement[] result = new XElement[] {
user.exportToXmlForViewing(context), user.exportToXmlForViewing(context),
new XElement("posts", new XElement("posts",
from post in posts select post.exportToXml(context, true), from post in posts select post.exportToXml(context),
pageOuter.exportToXml(2, 5, 2) pageOuter.exportToXml(2, 5, 2)
) )
}; };

Write Preview
Loading…
Cancel
Save